.conflicted-files-text {
  margin-bottom: 10px;
}
